Denormalize entity tags
4.6.5
Merge branch 'release/4.6'