Merge "Sysconfig: Allow runtime differentiation of product configuration" into main