Synced the latest code from the TFS: changeset 1837 build 2777