Fix merge with maint