4.4

Merged 4.4 changes from master into NEI