[RCD] Patch for #1484560 ticket