Merge "fixing Logger usage Issue"