Merge "Adding config param to choose packet types for address tracking"