Merge "Don't signal an error at the end of a short file" into lmp-mr1-dev