Merge pull request #2411 from FinalAngel/develop

added missing loader reset
do not go over ORM