Issue22506: merge from 3.4