Srivenu/18579 push

18579 - PET support