Merge "Add support for logkit"