may be final without mutex
Merge branch 'master' into wj_dev