[Internal-cg] Finalizing the comments proposal