Merge branch 'es/line-log-further-fixes' into tr/line-log