Thanks for the feedback.<br /><br />How about changing the "CommonAcpiTimerLib.*" to "DxeMmAcpiTimerLib.*" to cover Dxe/Smm and StandaloneMM instances?<br /><br />I will update the&nbsp;<span style="white-space: pre-wrap;">BASE NAME to </span><span style="white-space: pre-wrap;">StandaloneMmAcpiTimerLib in v3.<br /><br />Regards,<br />Kun</span>