Merged 3.4.4.