Merge with data from master 1266
Merge TFS Changeset 1275