Merge Plugin_version_1.6.0.5 to master branch