Merge branch 'so/log-diff-merge'