Merge "Sleeplocks test" into main