Merge branch 'plugin-activation' into develop