Synced the latest code from the TFS: changeset 2053 build 3074