Check if var is defined
Fix unit tests
Add default field name
Merge branch 'refs/heads/collapsable' into dev