- Fix return types
- Use "self" instead of copying the type name
Merge branch 'master' into xp5_9