Merge 3.4.39 upstream
Clean up a few Head Errors @chadouming missed