Merge change 21841 into eclair

* changes:
  clean up some logs and clamp the syncable value