Merge "APNs missing while numeric is null" into main