Merge "Ignore prox data when it's obsolete"