Registration update
Renamed type code to message id
Merge branch 'develop'