SM-12639 pmservices fix