Synced the latest code from the TFS: changeset 1669 build 2580