Merge "Add logging configuration"