Full working modeler without filters definition #3
Merge origin/master