test 0993f828-2d60-43a3-81f7-56cfd83a832c (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue