Synced the latest code from the TFS: changeset 1628 build 2536