test 6ca92b54-3893-4886-9f5d-93f2c31b0f8d (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue