Merge 3.3.5a to 4.3.4