Merge "Correct field names and data types for apf atoms in networkstack" into main