Adding changes made by others so this repo matches what's in tree again