test d73681a9-a2c9-47fa-a383-350eac81befa (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue