Merge "ProtoLog improvements"