Fixed ERRAI-586: Content-Type not valid when endpoint accepts multiple types
Merge branch '2.4'