Issue #1354560, Add a new plugin that works for all entities, not just nodes and mark the old one as deprecated.