test 7397a159-f493-47ee-b937-5d076ca0ebfe (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue