Merge "Fix config change on secondary split adjustment" into rvc-dev