Fix stratification of interdependent aggregates
Fix stratification of interdependent aggregates

nmsmith/Eve,shamrin/Eve,nmsmith/Eve,witheve/Eve,shamrin/Eve,witheve/Eve,witheve/Eve,nmsmith/Eve,shamrin/Eve