Merge branch 'sb/line-log-plug-pairdiff-leak'