Merge branch 'js/log-rewrap'