formatting fix
fix multiserver if no servers specified
Merge branch 'feature-portal' into development