CG-2786: Fixes to include configuration parameters