Case 3584 - Reexport.
Merge branch 'case-3584' into develop

* case-3584:
  Case 3584 - Reexport.