test ca9eb4b3-375b-421c-8f28-2b739ab92a70 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue