test c8499c5f-10d7-487a-94c8-c33618d6a109 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue