Round to int before removing overlaps
Merge branch 'topic/scaling' into devel