Incl. registration directory.
Merge branch 'develop'