Merge pull request #8798 from ivq/8665-backport

Backport 2.28: Reduce many unnecessary static memory consumption