test bd72ba3a-5bce-4b3b-9619-901400186740 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue