Synced the latest code from the TFS: changeset 2305 build 3508