Merge "Split out config option registration"