SM-13386 Minor updates