Update to4.4

Merging latest changes