Merge remote-tracking branch 'origin/develop'
Release of new version 1.18.1
Corrected changes
Merge remote-tracking branch 'origin/master' into develop