Merge branch 'master' into dev
Various improvements
Merge branch 'dev'