Fix Core 3 reference
Merge branch 'feature/oasis-style' into gh-pages