Merge "Improve proto parsing layer" into main