Merging global config support from Nicola's branch