Bug 1066145: add temporary server
Merge default -> production