Merge branch 'dev'
release 1.0.18.1