Merge branch 'maint' to sync with 1.5.2.1