Stop the server intent, and add some extra system.out
Merge remote-tracking branch 'origin/development/architecture' into development/architecture