Replace initialiser return types of id with new instancetype
Add missing super call
Merge branch 'refs/heads/feature/instancetype' into develop