Merge with 3.2 for #12364.