Work item: ORCH-057
Repo: orchestrator
Branch: feature/ORCH-057-bug-follow-up-orch-040-normali
Stage: development