update deps
Merge branch 'master' into CFY-1185-remove-plugin-inheritance