Attribute name spelling in setting zk_id
Stack changes in master on top of current develop