Merge changes from topic "bug162286562"

* changes:
  Fix #removeChildSessionId (4/n)
  Fix #removeChildSessionId (3/n)
  Fix #addChildSessionId (2/n)
  Fix #addChildSessionId (1/n)
  Ensure mutation to multiple objects is done atomically