Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3