Merge "allow clearing fields for LogMaker reuse"