Merge "Improve integer aligned coordinate detection"