JBIDE-15374: TP based on Luna M2