Merge origin/master Conflicts to workaround Gson escaping