SEC-2357: Fix package cycles