Merge branch 'develop'

2 jobs for maja-4.6 in 9 minutes (queued for 2 seconds)