Merging devTPM Updates