Merge pull request #349 from ariard/2019-07-data_loss