test 2e583099-8453-49c8-a1fe-77ce4971f442 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue