Merge pull request #1132 from LaurenceLiZhixin/Fix/3.0-plugin

Fix/3.0 plugin