test 0fbb7181-f06f-4dc4-82ae-49fc85b69d04 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue