FC-309 - Dependency upgrades