Merge branch 'maint' to sync with 1.7.3.5