test 5c5c2315-f6fa-4796-9344-2962fb15dc42 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue