CXF-6146
CXF-6145