Merge "Increase lock scope to protect variables" into main