Merge branch 'hotfix/gpl'
Merge branch 'master' into dev