Merge remote-tracking branch 'origin/feat/monitoring-service' into feat/monitoring-service