Merge "Adjusting the apn action items" into main