Improve the model setter
Add the changes from Chiba 2
Merge branch 'feature/model-setter-improvment' into master/elche

Conflicts:
	CHANGELOG.md
	novius-os