Should fix issue reading an entities name before its initialized
Merge branch 'dev' into jas1.4.7 for 0.8.2