changes from bzETL