Merge branch 'dev' (plugins-upgrade release)