etl

a4146806 - Merge branch 'hotfix/#657-Wpedantic-failure' into development