update harmony settings
Merge branch 'develop' into refactor/components