Merge "Add equality operator for state checking" into pi-dev