Plugin version 1.6.0.8

Merged dev branch with Plugin_version_1.6.0.8 branch.