Fix matcher / scheduler, and upgrade toggle on userlist
Reduce scope of populate and finish userlist v1
Merge branch 'userlist'