tidy up registration from #230 #281 #291

tidy up registration from #230 #281 #291
Merge remote-tracking branch 'origin/dev' into ci