[Ssr2-review] Recommendation 31