Upgrade to be compatible with 4.4
Merged fixes of 4.3 release