manual merge in 10/10 CCSP drop