Merge "Add log parser support"