Merge branch 'milestone/monitoring' into jennifer/request_id