=htc optimize rendering for Strict entities
Merge pull request #16294 from spray/w/optimize-Strict-entity-rendering

=htc optimize rendering for Strict entities