Merge branch 'feature/csr-use-attributeNames' into fix/34-matching-algorithm