fix combiner bugs
Merge branch 'feature/combine' into develop