Case 2796 - Changed calls to entity.
Removed deprecated fields from info file.
Merge branch 'new-search' into develop