2af1ae5d8a
Improve reliability of HasChanged check
Original-merge: b2d54b82fa
Merged-by: crobibero <cody@robibe.ro>
Backported-by: Joshua M. Boniface <joshua@boniface.me>