Merge branch 'fix_null_termination'