test 3c5ced87-4471-4042-b861-253e73c82e79 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue