Closes #14511: merge with 3.2