[Olena-patches] cleanup-2008 2450: Sandbox: continue to revamp registration.