test 28c6b89d-fea9-4849-8774-4f80a664a1fc (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue