test 1f9252f7-7f9f-421c-91c4-974131134568 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue