CON-1809 | sanitization