nohead small optimize
dont crush on null favorites
Simpler block delete
locks cleanup
wip
wip
timetaker
wip
Merge remote-tracking branch 'proller/lock' into lockvm
Merge remote-tracking branch 'upstream/master' into lock
Merge remote-tracking branch 'origin/lock' into lockvm