KULRICE-11659: Adding changes
KULRICE-11659: Adding extra changes