Merge "Correct lock check failures"