fixed design flaw: cond's didn't get regenerated
Merge remote-tracking branch 'origin/master'