Merge commit 'origin/Static-ARP' into tomato-shibby