Build 8533 of branch trunk