Synced the latest code from the TFS: changeset 1910 build 2886