test de73c3e7-c011-41c1-a961-abada0c93e87 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue