Client alignment using dynamic threshold
Merge branch 'auto-align'

* auto-align:
  Client alignment using dynamic threshold