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

Version 1.8.1