Merge branch 'tex_combine4'