Merge branch '86xx' into for_paulus