test 3221b08e-ed72-4add-b7a1-ef4dfa6fd26e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue