test 9b18bf86-1b87-4c8a-a209-f35b4f203687 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue