test bf29d9f3-38cc-44c0-9ff6-3da8e58f12c8 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue