reapply modifications as per patch

Guillaume Pacillyrequested to merge
issue/draggableviews-3158196:3158196-allow-any-entity into 2.1.x

Closes #3158196

Merge request reports