Merge branch 'idempotent-tests'
Merge branch 'self-instantiating'
Merge branch 'extracurricular'