Merge "Don't allow splitting on an empty configuration"