Merge "Add general logging conf"