Merge "Remove obsolete comment from FileIntegrityService" into main