Avoid ConcurrentModificationException on getConnection, and avoid
useless system.out on server
Merge remote-tracking branch 'origin/development/architecture' into development/architecture