am ff643a71: Merge "Fix synchronization when preparing ids." into klp-dev

* commit 'ff643a71289d972e66a61637947090c6dc950d14':
  Fix synchronization when preparing ids.