PR fixup: add TODO around log handling