Merge branch 'master' into 'v1.0.6'

Merge latest released changes.

See merge request !600
14 jobs for v1.0.6 in 30 minutes and 47 seconds (queued for 2 seconds)