Updated for EOY ela cg merge.