TIMOB-9819-Additional changes to fix gradient issue