Merge "Fix start pointer position in CTS" into nyc-dev