Merge "Add fixed ip client and tests"