Merge fixes for #13193 and FAQ from 3.2