Integrity check

Theodore Changrequested to merge
integrity-check into develop

Merge request reports