Merge branch 'dt/log-follow-config' into maint