Merge branch 'rc-4.4.0'