Merged from 3.4.