[FIX][TASK 10038] Take cfs_activity into account