Merge "Some of header changes for partial convo settings" into rvc-dev