[CB,BR]{other} Additional Changes for logging and testing in the Server
Code