Merge "Additional logging to debug HSUM in hotseat." into main