Merge pull request #10091 from ysc3839/tr-web-control