Merge branch 'mm/maint-hint-failed-merge' into maint