Merged Changes regarding Display, TP and Sensors