[Gnso-igo-ingo-crp] Reviving Option #5