Merge branch 'fix-build' into 'master'

Fix Build after License Change

See merge request !13
5 jobs for master in 3 minutes and 3 seconds (queued for 2 seconds)