[sr-dev] git:5.7:95465330: outbound: reformat exported structures