Merge branch 'ddbnext-hotfix-4.4.4' into my4.4.4
Merge branch 'my4.4.4'