Merge branch 'lt/maint-reflog-expire' into maint