add config_options hash for client subfile
Merge branch 'hotfix/1.7.0'