Merge tag '6.31' into 6.x