Merge branch 'by/log-follow'