test 02245aae-a0c7-4e42-bdad-04a77c9225db (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue