Add registration location
Merge branch 'yang' into dev