[Backport release/v6.x] Optimize and reduce storage and some iterations#955

brendaloya merged 1 commit intorelease/v6.xtellor-io/layer:release/v6.xfrom

backport-953-to-release/v6.xtellor-io/layer:backport-953-to-release/v6.xCopy head branch name to clipboard