etl

c09a1885 - Merge branch 'hot-fix/#536-undefined-behaviour-and-memory-issues' into development