test ad70a842-14f6-4bb2-8708-d2ee866a4d94 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue