fixup! Merge branch 'content-topics-merger' into stage