Changed IsValid() call.
Merge branch 'master' into linux-cs-test