BZ-11716: Add cost and payback to the ecm, and merge preview changes from master