Merge tag '0.31.4'