Synced the latest code from the TFS: changeset 2223 build 3318