SM-12639 pmservices topic fixes