Merge release 2.4.4