Merge branch '215-fix-opaque-type-indexing' into 'master'