test 1be7baf0-001b-4d46-a840-a64b20c3cbea (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue