Cherry picked csv method due to conflicts