Mostly-null merge from 3.4.  (Only added the tag for 3.4.4rc1.)