Merge branch 'cc2520'