Merge "Filter local_ip testing"