support nested props in conditionals
handle additional undefined cases
Merge branch 'ignore-undefined'