Pull changes from absingla/web-controller/master to absingla/web-controller/monitoring