Issue #1604 first draft of new rid set.