Escape quotes on custom container type ref #6787