[Ssr2-review] SSR1 Implementation Follow-Up