SM-8158 delegate update