Fixes to type guards
Merge branch 'master' into typeGuards
Modifying tests and accepting new baselines
Addressing CR feedback
Merge pull request #1163 from Microsoft/typeGuards

Fixes to type guards