Merge "Unify split options into single option" into tm-qpr-dev