Merge "Config utils improvement"