client ip fix
merged branch