KRACOEUS-6792: Moving Jisha's commit from 5.2.0 to 5.2.1