Merge branch 'release/0.3.5' into develop
Don't evaluate against all fields but rather lookup
bump version
Merge branch 'release/0.3.6'