Merge "Allow redirecting log to console" into main