[Fhb-update_cgp] FHB Update from OK, 05/17/18