BZ-12054 Create mark-up for product config
BZ-12025 ECM clean-up