Refactor backend/strategy to avoid circular dependency
Version change (no backward compatible change)
Update tests