Merge branch 'maint' to sync with 1.6.5.7