Merge "Revert "Refactor StructCapUser{Header,Data} and StructLinger for API review""