Merge branch 'maint-1.5.6' into maint