Merge tag '1.8.0' into develop

demo again
Merge tag '1.8.2' into develop

demo
Merge branch 'release/NTlkZj'