SM-8158 delegate misc changes