organization model
Merge branch 'GS-16-TRN' into GS-12