Merge tag 'v2.1.0'

2.1.0
Fix a regression where undefined id should not match any record
Bump version
Merge branch 'release/2.1.1' into production