Fix single-node (2 instances) run.
Merge branch 'development' into next