Merge "Update FeatureSplit sample"