XLCLOUD-1335 Fixed JSON mapping problems.