merge 4.3.6-fix