Fix bug NOT ORM
Merge branch 'origin/master'