Merge branch '123123' into json
cafedetails & adapter
Merge branch 'json' into test