Merge branch 'master' into develop
case 1683 - More wide entity id pickup.
case 1683 - Method rename.
case 1683 - Do not munge id's here.
Case 2512 - Modify 'alt' attribute for cover image.
Merge branch 'case-1683' into develop
Merge remote-tracking branch 'origin/case-2512' into develop
Merge remote-tracking branch 'origin/develop'