Merge branch 'master' into 'develop'

Master

See merge request !705
2 jobs for develop in 20 seconds (queued for 8 seconds)