Merge with 3.2 for #14359.