bugzid 3684: fixed server architecture - develop