[3.0] backport some parsing fixes

Backports of !7549 (merged), !7550 (merged), !7553 (merged) and !7551 (merged)

Plus some commits to get closer to 4.0 and minimize patches differences.