test c25da837-8512-4c81-8700-59b37167b8e2 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue