Merge "Don't abandon child sessions (1/n)"