[TIMOB-13269] Fixed unknowns short-circuiting expressions
Merge pull request #134 from bryan-m-hughes/timob-13269

[TIMOB-13269] Fixed unknowns short-circuiting expressions