Merge "Solve IP-Hash issue"