Pulled upstream into PolyCode