Merge branch 'maint-1.6.3' into maint