Merge branch 'cdc_ncm-coalesce'