[sr-dev] git:master: uac: reorder fileds in uac structure