Merge "Issue fix for config subsystem"