Merge "Fix wrong lock scope" into main