Merge "Replace singleton lists with None defaults" into feature/zuulv3