Merge branch 'hotfix/add_blacklist_settings'
fix
Merge branch 'hotfix/fix_code_style' into develop