Merge "Match APN types with ignoring the case" into main