Merge 4.3.8 release, fix conflicts