Merge branch 'milestone/monitoring' into jennifer/no_mq_priorities