Merge branch 'master-K2' into K2-singlefile. Compile. Tests OK