ROBE-110 Unnecessary Type parameter at Base Entity deleted