Merge branch 'mm/maint-config-explicit-bool-display' into maint