Merge branch 'v1.0.5' into 'master'

Merge for release v1.0.5

See merge request !598
14 jobs for master in 31 minutes and 57 seconds (queued for 3 seconds)