test d80f78af-aac2-47ea-92fc-d707d89a1564 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue