Part of Bug 1025805, multiple RIDs over time
Merge pull request #282 from adamlofting/bug1025805

Part of Bug 1025805 multiple RIDs over time