Merge 3.3.5a into 4.3.4