Merge branch 'ti/external-sha1dc'