Merge branch 'hotfix/1.6.1'
Merge branch 'release/1.7.0'
1.7.1 installer fixes and add GenericFont.xml
Merge branch 'hotfix/1.7.1' into develop