test 5233c82f-529a-48d7-8389-08771fdf3635 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue