Merged Vulpie changes with upstream