Add fluent stackable conditions
Merge branch 'feature/stackable-conditions' into architector/internal