Small fix to handle UnitTest issue that happens in TeamCity
Merge branch 'Issue_436'