Kick out into config class
Merge branch 'master' into extract_to_config_class
Fix deps
Merge branch 'extract_to_config_class'