PRD-4254 - Fixing dependency issues