This is a combination of 2 commits.

Fix: post merge with cherry-picked commits on calculate_causality interaction

Don't call calculate_causality after method _setCategoryList