Merge "Fix system user only crash" into main