Update to 4.4.4 changes