Merge change 26710 into eclair

* changes:
  Delay the type value change until the custom value is correct.