Merge branch 'fs/find-end-of-log-message-fix'