Merge "Add missing lock." into tm-qpr-dev