new entity interview integratione+ [3]
Merge remote-tracking branch 'origin/develop' into develop