test caf5f44f-c7bc-4f89-9ce6-4177a4ecdb69 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue