a730888ce0
Major breaking change from 1.x, so treating keeping both versions for now. (adapted from33f11be707) (adapted from9e8dea7986)