Error handling for missing license
Merge branch 'master' into testing