registration and activation (cherry picked from commit b893737)
registration and activation
(cherry picked from commit b893737)

litixsoft/baboon,LitixThomas/baboon,litixsoft/baboon,litixsoft/baboon,LitixThomas/baboon,LitixThomas/baboon