Merge branch 'develop'

2 jobs for maja-4.5 in 9 minutes and 6 seconds (queued for 3 seconds)