Synced the latest code from the TFS: changeset 2247 build 3363