Merge pull request #2737 from alarcher/ck052