Merge "[TEST-45] support injectable ips"