test ea6a57c5-878d-48d2-85ff-d7ec7825b5f0 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue