test 25098fd4-4ff6-4e24-85cc-132b8e06f211 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue