Prepare for next plugin version
Merge branch 'plugins' into plugins_test