Merge 4.5 back into master

It would be good to have this as a daily practice
Hardcoded internalServerIp? Is this dead code?