Merge "Remove unneeded getUserOrDefault" into main