Update to refactor of SS.Common