test e4fc0665-eb55-4662-b3e1-01ec42185125 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue