4.4 merge fixes