Merge change I280c753a into eclair-mr2

* changes:
  Modify text validation behavior.