Merge models on development

Redundant `self` detected.