Merge "Move ipconfig file inside apex data directory" into tm-dev