etl

bc682c58 - Merge branch 'hotfix/bug-when-self-merging-lists' into development