case 4249 - Legend module.
Merge branch 'case-4249' into development