DDBNEXT-1451: entity page fix
Merge branch 'DDBNEXT-1451_2' into develop