KRACOEUS-7074 : Reapplying fix that got lost during 6.0 merge and applying further fix due to space in the column name