BK-1045 Remove json_wrapper from the code
Merge branch 'BK1045' into 2.0