XX-10872 - move setting json handing to common class