Merge "Add logging config values"