#1606 Concurrency improvements in Roster+waddell