Merge branch 'master-new-features'