fix 4.3 merge