split the feature in two parts for CXF-5747