Bz1110062 - dot net changes and merging the latest from master