#7782: merge with 3.3.
1 file changed