Merge "Fix unintended early return in service creation." into main