Issue 21383: merge from 3.4