[FR] - Backport "SPO on-chain poll commands adjustments" to `1.35.x`

[newhoggy]

Internal

Governance

Describe the feature you'd like
Backport #5132

[github-actions]

This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 120 days.