reapply modifications as per patch

Closes #3158196

changed target branch from 2.0.x to 2.1.x

added 33 commits

• 88465193...c6f98e0b - 32 commits from branch project:2.1.x
• 370755e3 - Merge remote-tracking branch 'origin/2.1.x' into 3158196-allow-any-entity

Compare with previous version

Will not merge as it is calling _entity function. I will look at solve in [#2985291]

closed