Merge " Fix logging format"