Merge branch 'dev' into 'master'

Hotfix 3.17.1

See merge request !29
1 job for 111-update-dependencies in 1 minute and 23 seconds (queued for 1 second)