Merge "Add additional enums to NasProtocolMessage" into main