Merge "Fix keyerror with synchronize" into feature/zuulv3