version 2.1.8
Merge branch 'release/2.1.8' into develop