Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4