etl

946b48cb - Merge branch 'hotfix/#454-fix-compiler-error-msvc-16' into development