#19166: merge with 3.3.