Merge branch 'hotfix/License'
Updated license
Merge branch 'hotfix/License-r1' into develop
Merge branch 'develop' into feature/Search