Merge "Improve touch finished logging" into main