Merge "Add checking for log entry format"