Merge branch 'dev' into 'master'

Version 3.18.3

See merge request !42
1 job for 3.18.3 in 2 minutes and 17 seconds (queued for 3 seconds)
latest