Merge branch 'feature/conventions_revision' into development