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

* case-2950:
  case 2950 - Reexport.