test cc6b154d-c324-4eab-9508-c53380a43236 (rebased onto develop)


This is the same as gh-9840 but rebased onto develop.

----

This is a call to Sandbox.open_pr by testPushRebaseContinue