solutions for 10 and 11 with UNTESTED CMAKE files
Merge branch 'ManuWork'