Fixed wrong var compare bug.
Merge branch '9s-part1a' into 9s-part1b