Merge "Silence command warnings" into feature/zuulv3