Fixes #5111 - CSV handles collection or container