RE: Minor changes for supporting products with GC 11.0.4