test 3132eec7-3494-486d-b78f-44393686763b (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue