[Ssr2-review] Comments from Marrakech