Changes made for fixing concurrent logging issue.