master branch -mem leak fix -user1
Master branch -live lock fix-user1