Merge branch 'develop'

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