[MAGEMEP-122] Removing inheritance type in grid when no inheritance
Merge branch 'master' into MAGEMEP-125