Merge branch 'maint-1.5.4' into maint-1.5.5