SM-12769 edit