TFS #36331 Support au data center and other data centers - fix1