Merge "Make *Repository#get(int userId) lock-free" into main