Merge change 4247

* changes:
  Fix AbstractTableMerger for new Account format.