Use separate locks for separate member variables in lib
Merge branch 'master' into builds
7.397