backport fix for RIZ-451320 (CDO encoding error)