test 877d53e5-09de-4c8e-9f79-3d60ef728abd (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue