Merge branch 'release/1.6'
Merge branch 'release/1.6'
plugin files updated
Merge branch 'release/1.6'