Build 9504 of branch trunk