test a4ed0722-8797-4809-b998-9bc4682fedab (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue