Fix for CXF-5118