Synced the latest code from the TFS: changeset 2145 build 3214
Version 1.2