Merge branch 'dev' into kit/effectify-plugin