am afb847a4: Merge "Clean up synchronization"

* commit 'afb847a4692a6e5cded8c7a330d00b70b794896a':
  Clean up synchronization