MM: Port 3.0.81 changes to cma part.