Merge branch 'mpc8641'