Merge "Fix for out-of-bound error regarding NoCopySpan objects" into tm-dev