test 4e1e1603-0683-47db-bc16-c96b0ab444a2 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue