fix entity issue
Merge remote-tracking branch 'origin/kimono_data' into develop