[RCD] Proposed patch against against 1732