test aec9eef4-6567-4447-a1db-63f618fb5a03 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue