test d357007d-1b22-43ed-8a76-6f111416dfaa (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue