Attn: this plain patch port still contains issues caused by differences in the ParseNode tree that will be fixed in the following commits. Based-on: m-c 1466000/{7-10}