clean up Coordinates
Merge remote-tracking branch 'origin/4.5.0' into 4.5.0