Filed PR 3501 to cover the work for the crazy advanced logging.