Merge branch 'release/1.8.1' into develop
update maven snippet
Merge branch 'develop'
Merge branch 'mainline/master'