Synced the latest code from the TFS: changeset 2070 build 3096