CMA LSK backport review and test