Merge pull request #537 from TheBlueMatt/2020-03-data-loss-spec-550