Merge with 3.4 for porting HOWTO tweaks