Update to v2.55-161-g0996aae