#1207589: merge with 3.3.