Fix populate-entity-tagarray.
Merge remote-tracking branch 'origin/release/4.6'