Merge "The -O option now takes a CSV instead of a single value"