[sr-dev] git:5.8:95feca55: outbound: reformat exported structures