3.5.4 maint release