Merge pull request #746 from ryantsai/claude/kkterm-discussion-744-yxgndu