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