Fix the gauge over-request issue #9987 and #10486#10496

nbcss wants to merge 3 commits into

Creators-of-Create:mc1.21.1/devCreators-of-Create/Create:mc1.21.1/devfrom

nbcss:mc1.21.1/devnbcss/Create:mc1.21.1/devCopy head branch name to clipboard