[Olena-patches] 2612: Registration Fix.