Merge branch 'remove-copyteximage-hook'