Work item: ORCH-088
Repo: orchestrator
Branch: feature/ORCH-088-orch-88-10-20
Stage: development