Monitoring templates fixed to work on base device
Merge