Merge branch 'km/avoid-cp-a'