Synced the latest code from the TFS: changeset 2160 build 3241