Merge "Fix zuul command default function" into feature/zuulv3