CSH-1166 #time 3h # bug fix testing logger changes to refactor code.