Merge branch 'dev' into 'master'

Version 3.18.3

See merge request !42