case 3976 - Reexport.
Merge branch 'develop' into case-3976
Merge branch 'case-3976' into develop