Merge branch '2020-02-28-mpc8xx-fixes'