Merge branch 'w_json_metadata'