Merge "Duplicate apn entry" into main