Merge "Use single accumulating shell transition handler mapping" into main