[3.8.5] Add Cross Domain Configuration