YOMO-7159 combine conditions