Merge "Replace jackson usages with GSON"