Merge "feat(hcx): add build option to enable FEAT_HCX" into integration