test a2a4dd64-f92d-4f56-86db-12e6cd3493fa (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue