Pull request for tpm-20012023