Do awful correctness-checking manual topic merge
Merge branch 'fix-km-topic-resolution' into stage