Merge branch 'feature/populator-classes' into v2