Merge "Don't abandon child sessions (1/n)" into sc-qpr1-dev