test 728900b5-1df3-428b-a128-0bf34159ba9e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue