#4578 avoid hibernate join on inode

I think we should merge this into release-2.5.2