Merge changes Ibebdae14,I0c097e77,I6c889b15,I4771f2e9,I2a52f7f4

* changes:
  [NS A23.1] Minor cleanup
  [NS A23] Move a synchronized block in a central place
  [NS A22] Small refactoring
  [NS A21] More cleanup
  [NS A20] Cleanup