Merge #10351: removed unused code in INV message