[#25540] Update core to 7.31
Merge pull request #212 from previousnext/25540-core-731

[#25540] Update core to 7.31