Merge "Config parameter map styling, 3" into master_vca_intg