Merge change 20207

* changes:
  Implement basic snapping.