Merge pull request #5592 from MerryMage/config-commandline Config: Remove creation of unnecessary CommandLine layer
