Synced the latest code from the TFS: changeset 2019 build 3020