SM-13565 Tomcat topic updates