better datapath extraction without the better type estimation of case statements
datapath extraction ready
Merge branch 'datapath' into dev