Merge "Fix range check when encoding FPLMNs" into main