r1887 + adjust sample data to the new PortForwarding structure