[IM] Use 4/6 for protocol identifiers
[IM/BF/CR] Fixes for new network information code