Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev