test 04d5a00f-3c28-48cf-957b-01f90604d552 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue