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