Fix infinite folder issue.
Merge branch 'dev'
Should fix issue reading an entities name before its initialized
Merge branch 'dev'