Merge branch 'release-44'