Issue #2351373 by a-fro: Fixed broken dependency on Entity