Merge "Adaptation of PnP PNF simulator heat template"