Change method signatures to not implicitly require an instance of the default model classes
Merge branch 'hotfix/1.2.1'