Merge from head. Resolves #20611.