[RCD] Implementation of Feature Request #1490538