FORGE-1754 - Fix Configuration Subsets