KRACOEUS-7427:added conditionally rendered fields