Merge branch 'rr/core-tutorial'