Merge branch 'cherry-pick-17b7a9ed' into 'main'

Merge branch '98-fix-service-order-validation' into 'develop'

See merge request !98