Uf 28

Also combines branch UF-42 and UF-48