Merge "Move clinit code to registration funtions"