test 47874a1d-e723-4ecc-9a21-ca76538c9316 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue