Topic kpi changes for 3.0.x

@CHenrie Please review. Cherry picked the develop commit for 3.0.x.