test 1d643cda-e038-40fd-8749-c3861e2472df (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue