Adds changes required for topic bug fix in core