test 0fd370d1-f626-4939-b147-ba931a4bf7c3 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue