Version: DE-178236-preserve-customer-name-when-flag-disabled