LPS-36411 LPS-36411 Maintain all missing references even if the missing reference is the same entity