Dp 2864

These changes should probably not be committed. Production endpoints are used by default, not localhost.