Merge pull request #2262 from Kixunil/remove-serde-error-allocation