Merge "Fix early registration problem" into sc-dev