Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint