Merge branch 'cb/log-follow-with-combined' into maint