#12759: merge with 3.3.