IT changes for custom kind

Ratnesh requested to merge IT-Change-RebasedOnMaster24May into master

Merge request reports