Updated contrib module entity reference
Merge remote-tracking branch 'origin' into release