Merge "Update method annotation to ensure lock is held" into main