test eae829b9-89ce-46ad-aaf2-f150e1c9819d (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue