test 87570dc6-f14b-4a9e-bc35-39e0b7528254 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue