Added support for sanitizing converter.
merged upstream changes.