Merge "Preserve topic when cherry-picking"