KAA-183: Refactoring of voluntary topics to optional topics