Getting april changes from treekit back upstream

hopefully these are good :)