Using sm client websites

Retargeting PR at new dev branch.