replaced explicit + descendant listing calculation with values from cascading listing changes (to avoid issues with inclusions and reduce discrepancy)
Merge branch 'natator_depressus_fix' into moschus_fix