fixed E_STRICT notice for Orm convertation
minor improvements
fix warning
Merge branch 'hotfix/2.7.1'