Merge "Prepare for 1.31 branch"