CMA-29: changes