Merge "Remove duplicated states from zk.py" into feature/zuulv3