Merge "Imported Upstream version 1.4.4" into devel