test b7275f6d-67a0-4146-b902-88b059a49d68 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue