etl

197f65c5 - Compiler compatibility updates