issue #2580: Merged plugin-x and some bug fixing to master branch 

Merged plugin-x and some bug fixing to master branch