including feedback from https://github.com/ServiceStack/ServiceStack.Text/pull/432