Merge branch 'develop'
RWLock -> Lock
Merge branch 'master' into develop