Changed plugin dependency
Merge branch 'isoda' into isoda-final