Merge branch 'v2.1.7' into testing
Merge branch 'v2.1.7' into testing
Merge branch 'v2.1.8' into testing
Merge branch 'v2.1.8' into testing
rename file
remove Commercial license
Merge branch 'testing'