Merge "Add hook into thermalservice"