Merge "Fix data usage when policy has no cycle" into 24D1-dev