Synced the latest code from the TFS: changeset 2111 build 3165 (#405)