Synced the latest code from the TFS: changeset 2041 build 3052