Updated for EOY mth cg merge.