Merge "Fix last place where we need singleconductor"