Remove duplicate Config instance
Merge branch 'pr/426' into develop