1. add locks here
Merge branch 'master' of github.com:magiczhao/devlib