Better locker
No clear mesh queue
Merge remote-tracking branch 'upstream/master' into drawlist