Merge branch 'configuration_setter'