Merge branch 'master' into dev
manifest: bumped version
Merge branch 'dev'