Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"."