Merge branch 'cl-cost-model' into distributed-fmm