test dbc705bb-9b07-42a4-b57f-911ac1d6e8cb (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue