Merge 3.4.3 release engineering changes back into 3.4.