[Update] Adjust 3.1.0
Merge pull request #8813 from x2on/Adjust-3.1.0

[Update] Adjust 3.1.0