test 879af07f-dcb7-4fca-8106-8c086267b43b (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue