Attempting to resolve #103
Merge remote-tracking branch 'upstream/develop' into feature/atomic-operations
Ignore files in list if they are in transaction