fix for multibox with same cloud service name
Merge branch 'fix/multibox'