Merge branch 'release/2.1.8'
Merge tag '2.1.8' into develop

Tagging version 2.1.8 2.1.8