test 8af63a9f-9383-4f5b-abcd-8e33cbefefa5 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue