remove assert
more locks
Merge remote-tracking branch 'upstream/master' into lock