Merging latest from Thinktecture into AscendXYZ