Merge branch '85xx' into for_paulus