test 78be12b7-13d2-4399-832b-c8c526ceb5cb (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue