fix settings array fields
cleanup
Merge branch 'hotfix/2.7.3'