SM-13565 Misc Updates