Merge "Add sub owner to common/split and tests" into tm-qpr-dev