Update to support 6-8-stable