test 4212a271-320f-417b-b7eb-a0694275ca28 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue