Merge branch 'nd/log-show-linear-break'