Handle undefined names.
Merge branch 'dev'