Merge "Re-use existing method to get split root" into main