[#25540] Update core to 7.31

Update to 7.31.