Merge "BUG-2383: rework RIB inbound"