Merge follow-up for #11254 and other changes from 3.2