Merge branch 'dev' into 'master'

Hotfix 3.17.1

See merge request !29
1 job for 3.17.1 in 1 minute and 18 seconds
latest