merging recent commits of UF into personal fork

nada