Merge branch 'fix-default-config-account_field' into 'develop'