etl

23472f10 - Made non-template functions inline