test 5937ff06-52b6-4198-9766-9ed9f2493db6 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue