Merge forward (4.4.6.x => 4.4)

I'll merge this after 4.4.6-final is released.