CLSN-1258merge product config screens