Merge branch 'feature/doctrines' into brave.