Rollup of MMCC_26->CLAMP v2.6.4-LAE6.0.3