Merge branch 'OCF29-new-registration-flow' into OCF30-adapt-robot-framwork-tests-to-new-register-flow