Backported [CXF-5652]