Merge "Update SplitContainer for non-finishing containers" into tm-dev