Merge change 22344 into eclair

* changes:
  fix [2070341] [FAST BLOCKER] can't successfully setup erc52