improvements
progress
stable to merge
stable to merge
Merge branch 'master' into klim-changes