Merge branch 'feature/terse-require' into develop