Build 8327 of branch trunk