test c15720a9-5698-4399-a0f0-9d7df87c000a (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue