test 0f450187-c339-4966-88ac-ac8d6f733359 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue