Merge branch 'maint-1.5.5' into maint-1.5.6