Fixed it for the model extension.
Merge branch 'develop'

* develop:
  Fixed it for the model extension.