Merge "RIFT-15154: Config parameter map" into master_vca_intg