test 0c4d8b91-0a48-4b36-b941-152f360c9578 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue