test 0e264ed5-6a5a-4477-a9c3-3962a0fc7a3a (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue